Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <[email protected]>
Thu, 21 Jul 2016 22:54:58 +0000 (18:54 -0400)
committerTom Rini <[email protected]>
Thu, 21 Jul 2016 22:54:58 +0000 (18:54 -0400)

Trivial merge